Skip to content

add non-MITM proxy support#284

Closed
deads2k wants to merge 1 commit intoopenshift:masterfrom
deads2k:proxy
Closed

add non-MITM proxy support#284
deads2k wants to merge 1 commit intoopenshift:masterfrom
deads2k:proxy

Conversation

@deads2k
Copy link
Contributor

@deads2k deads2k commented Sep 19, 2019

Equivalent of openshift/cluster-kube-apiserver-operator#530 for kube-controller-manager. It's probably worth it to de-dupe the envvar creation itself.

@openshift-ci-robot openshift-ci-robot added the size/M Denotes a PR that changes 30-99 lines, ignoring generated files. label Sep 19, 2019
@openshift-ci-robot openshift-ci-robot added the approved Indicates a PR has been approved by an approver from all required OWNERS files. label Sep 19, 2019
@deads2k
Copy link
Contributor Author

deads2k commented Sep 19, 2019

/assign @stlaz @soltysh

@soltysh
Copy link
Contributor

soltysh commented Sep 20, 2019

/hold
I don't want this being accidentally merged to 4.2

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 20, 2019
@stlaz
Copy link
Contributor

stlaz commented Sep 23, 2019

this fails with

"configmap/kube-controller-manager-pod\": couldn't get the proxy config from observedConfig: .targetconfigcontroller.proxy accessor error: map[proxy:map[NO_PROXY:.cluster.local,.ec2.internal,.svc,10.0.0.0/16,10.128.0.0/14,127.0.0.1,169.254.169.254,172.30.0.0/16,api-int.ci-ln-610pfz2-d5d6b.origin-ci-int-aws.dev.rhcloud.com,api.ci-ln-610pfz2-d5d6b.origin-ci-int-aws.dev.rhcloud.com,etcd-0.ci-ln-610pfz2-d5d6b.origin-ci-int-aws.dev.rhcloud.com,etcd-1.ci-ln-610pfz2-d5d6b.origin-ci-int-aws.dev.rhcloud.com,etcd-2.ci-ln-610pfz2-d5d6b.origin-ci-int-aws.dev.rhcloud.com,localhost,something.lala]] is of the type map[interface {}]interface {}, expected map[string]interface{}"

when the config starts to appear in the observed config. The same code works in kube-apiserver-operator 🤔

stlaz
stlaz suggested changes Sep 23, 2019
View reviewed changes
pkg/operator/targetconfigcontroller/targetconfigcontroller.go
@@ -291,6 +293,20 @@ func managePod(configMapsGetter corev1client.ConfigMapsGetter, secretsGetter cor
required.Spec.Containers[0].Args = append(required.Spec.Containers[0].Args, "--tls-private-key-file=/etc/kubernetes/static-pod-resources/secrets/serving-cert/tls.key")
Copy link
Contributor

@stlaz stlaz Sep 23, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

manageKubeControllerManagerConfig() needs to use MergePrunedConfigMap() instead, this function removes fields that are not part of the config object from observedConfig

soltysh
soltysh approved these changes Sep 24, 2019
View reviewed changes
Copy link
Contributor

@soltysh soltysh left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

/hold cancel
/lgtm

@openshift-ci-robot openshift-ci-robot added lgtm Indicates that a PR is ready to be merged. and removed do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. labels Sep 24, 2019
@soltysh
Copy link
Contributor

soltysh commented Sep 24, 2019

/hold

@openshift-ci-robot openshift-ci-robot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Sep 24, 2019
@stlaz
Copy link
Contributor

stlaz commented Sep 24, 2019

/hold
does not work

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 24, 2019

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: deads2k, soltysh

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Details Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 24, 2019

@deads2k: The following tests failed, say /retest to rerun them all:

Test name Commit Details Rerun command
ci/prow/e2e-aws 1e2cb00 link /test e2e-aws
ci/prow/e2e-aws-upgrade 1e2cb00 link /test e2e-aws-upgrade

Full PR test history. Your PR dashboard. Please help us cut down on flakes by linking to an open issue when you hit one in your PR.

Details

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository. I understand the commands that are listed here.

@soltysh soltysh mentioned this pull request Sep 25, 2019
Merged
soltysh
soltysh reviewed Sep 25, 2019
View reviewed changes
pkg/operator/targetconfigcontroller/targetconfigcontroller.go
"strings"
"time"

yaml "gopkg.in/yaml.v2"
Copy link
Contributor

@soltysh soltysh Sep 25, 2019

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

@stlaz this was the culprit of yaml issues. I've fixed that and changed configmap merging to MergePrunedConfigMap in #285.

@soltysh
Copy link
Contributor

soltysh commented Sep 25, 2019

/close
in favor of #285

@openshift-ci-robot
Copy link

openshift-ci-robot commented Sep 25, 2019

@soltysh: Closed this PR.

Details

In response to this:

/close
in favor of #285

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@mfojtik mfojtik Awaiting requested review from mfojtik

@sttts sttts Awaiting requested review from sttts

2 more reviewers

@soltysh soltysh soltysh approved these changes

@stlaz stlaz stlaz requested changes

Reviewers whose approvals may not affect merge requirements

Assignees

@soltysh soltysh

@stlaz stlaz

Labels

approved Indicates a PR has been approved by an approver from all required OWNERS files. do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. lgtm Indicates that a PR is ready to be merged. size/M Denotes a PR that changes 30-99 lines, ignoring generated files.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

4 participants

@deads2k @soltysh @stlaz @openshift-ci-robot